Fix FTBFS

diff --git a/debian/control b/debian/control
index 09bfdbe576b5bd45da4a84ac6e24a9e3c11f3d25..9cc959ef353f1dbe5eab9ccaf3910699b36cb4c4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -68,13 +68,13 @@ Build-Depends: chrpath,
                x11proto-core-dev,
                xauth,
                xvfb,
-               zlib1g-dev
-Build-Depends-Indep: doxygen-latex,
-                     texlive-binaries,
-                     graphviz,
-                     ghostscript,
-                     libjs-mathjax,
-                     gnuplot-nox
+               zlib1g-dev,
+               doxygen-latex,
+               texlive-binaries,
+               graphviz,
+               ghostscript,
+               libjs-mathjax,
+               gnuplot-nox
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/science-team/vtk9

diff --git a/debian/rules b/debian/rules
index 7cec19730537e120f3ca17a9c4d250b30c3ebf78..3d3b73948243445e33172333a6219bf0f2415780 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,6 @@ BUILDDIR = $(CURDIR)/debian/build
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# deduce documentation option (build-indep target)
-ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
-  BUILDDOC = OFF
-else
-  BUILDDOC = ON
-endif
-
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
@@ -20,7 +13,7 @@ extra_flags +=  \
        -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DCMAKE_C_COMPILER=mpicc \
        -DCMAKE_CXX_COMPILER=mpic++ \
-       -DVTK_BUILD_DOCUMENTATION=$(BUILDDOC) \
+       -DVTK_BUILD_DOCUMENTATION=ON \
        -DVTK_BUILD_EXAMPLES=OFF \
        -DBUILD_SHARED_LIBS=ON \
        -DVTK_BUILD_TESTING=OFF \
@@ -72,29 +65,18 @@ override_dh_auto_clean:
        dh_auto_clean
        rm -rf $(BUILDDIR)
 
-override_dh_auto_build-indep:
-       # Make doc (see http://www.vtk.org/Wiki/VTK/BuildingDoxygen)
+override_dh_auto_build:
+       dh_auto_build
        cd $(BUILDDIR) && make DoxygenDoc
-       # remove .md5 files
        find $(BUILDDIR)/Utilities/Doxygen/doc/html/ -name "*.md5" | xargs rm -f
 
-override_dh_auto_build-arch:
-       dh_auto_build
-
 override_dh_auto_install:
        dh_auto_install -X.pyc -X.pyo
        # Correct headers for paraview
        mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
        sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
-
-override_dh_install-arch:
-       dh_install -a
-       rm -rf $(CURDIR)/debian/tmp/usr/share/licenses
-       find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \;
-       find $(CURDIR)/debian/libvtk9/ -name "*Qt*" -exec rm {} \;
-       find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \;
-       find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;
-
-override_dh_install-indep:
-       dh_install -i
        rm -rf $(CURDIR)/debian/tmp/usr/share/licenses
+       find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \; || true
+       find $(CURDIR)/debian/libvtk9/ -name "*Qt*" -exec rm {} \; || true
+       find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \; || true
+       find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true